From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 10 Jun 2011 08:47:06 +0000 (+0200)
Subject: xenpaging: drop xc.c, remove ASSERT
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10150
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=c08db669460495b17ba1530ba6230bdd4e332be6;p=xen.git

xenpaging: drop xc.c, remove ASSERT

The ASSERT is not needed, victim is never NULL.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---

diff --git a/tools/xenpaging/policy_default.c b/tools/xenpaging/policy_default.c
index 55a0ae8470..83fe830309 100644
--- a/tools/xenpaging/policy_default.c
+++ b/tools/xenpaging/policy_default.c
@@ -78,7 +78,6 @@ int policy_choose_victim(xenpaging_t *paging, xenpaging_victim_t *victim)
 {
     xc_interface *xch = paging->xc_handle;
     unsigned long wrap = current_gfn;
-    ASSERT(victim != NULL);
 
     do
     {
diff --git a/tools/xenpaging/xc.h b/tools/xenpaging/xc.h
index 27181cd309..38c4cb0867 100644
--- a/tools/xenpaging/xc.h
+++ b/tools/xenpaging/xc.h
@@ -30,13 +30,6 @@
 #include <xen/mem_event.h>
 
 
-#if 1
-#define ASSERT(_p) \
-    if ( !(_p) ) { DPRINTF("Assertion '%s' failed, line %d, file %s", #_p , \
-    __LINE__, __FILE__); *(int*)0=0; }
-#else
-#define ASSERT(_p) ((void)0)
-#endif